* lisp/emacs-lisp/assoc.el (aget): Fix dynamic-scoping issue.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 799ae933003f8c522d81c42730a571192d051669..8a6216717e955a7fe73757c33dc3354a82874272 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,6 @@
 2012-04-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * emacs-lisp/assoc.el (aget): Fix dynamic-scoping issue (bug#11352).
 
        * term/ns-win.el (ns-define-service):
        * progmodes/pascal.el (pascal-goto-defun):

diff --git a/lisp/emacs-lisp/assoc.el b/lisp/emacs-lisp/assoc.el
index d3185c444d720514569a56c12a3bc11fbedccb9b..8e6f7711d5bb398c44558ca0bd2876d44a351417 100644 (file)
--- a/lisp/emacs-lisp/assoc.el
+++ b/lisp/emacs-lisp/assoc.el
@@ -101,6 +101,7 @@ returned.
 
 If no key-value pair matching KEY could be found in ALIST, or ALIST is
 nil then nil is returned.  ALIST is not altered."
+  (defvar copy)
   (let ((copy (copy-alist alist)))
     (cond ((null alist) nil)
          ((progn (asort 'copy key)